From: tsteven4 <tsteven4@gmail.com>
Date: Mon, 12 Nov 2018 15:12:21 +0000 (-0700)
Subject: fix clazy detected 'Use multi-arg instead'
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~72^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=6f4bec9cd4f1c65ca734eac191df06ec7ddb9ce1;p=gpsbabel.git

fix clazy detected 'Use multi-arg instead'

these are from -Wclazy-qstring-arg
---

diff --git a/bcr.cc b/bcr.cc
index 7840a480d..d0814f468 100644
--- a/bcr.cc
+++ b/bcr.cc
@@ -447,9 +447,9 @@ bcr_route_header(const route_head* route)
     }
 
     if (sout.isEmpty()) {
-      sout = QString("%1,%2,@,0").arg(s1).arg(s1);
+      sout = QString("%1,%2,@,0").arg(s1, s1);
     } else {
-      sout = QString("%1,%2,@,0").arg(s1).arg(s2);
+      sout = QString("%1,%2,@,0").arg(s1, s2);
     }
 
     bcr_write_line(fout, "STATION", &i, sout);
diff --git a/gpssim.cc b/gpssim.cc
index d5cd442ad..77593ec7f 100644
--- a/gpssim.cc
+++ b/gpssim.cc
@@ -146,7 +146,7 @@ gpssim_trk_hdr(const route_head* rh)
       fatal(MYNAME ": output file already open.\n");
     }
 
-    QString ofname = QString("%1%2%3.gpssim").arg(fnamestr).arg(doing_tracks ? "-track" : "-route").arg(trk_count++, 4, 10, QChar('0'));
+    QString ofname = QString("%1%2%3.gpssim").arg(fnamestr, doing_tracks ? "-track" : "-route").arg(trk_count++, 4, 10, QChar('0'));
     fout = gbfopen(ofname, "wb", MYNAME);
   }
   (void) track_recompute(rh);
diff --git a/kml.cc b/kml.cc
index 43858f339..11c09db59 100644
--- a/kml.cc
+++ b/kml.cc
@@ -792,33 +792,33 @@ void kml_output_trkdescription(const route_head* header, const computed_trkdata*
   }
   const char* distance_units;
   double distance = fmt_distance(td->distance_meters, &distance_units);
-  kml_td(hwriter, QStringLiteral("Distance"), QStringLiteral(" %1 %2 ").arg(QString::number(distance, 'f', 1)).arg(distance_units));
+  kml_td(hwriter, QStringLiteral("Distance"), QStringLiteral(" %1 %2 ").arg(QString::number(distance, 'f', 1), distance_units));
   if (td->min_alt) {
     const char* min_alt_units;
     double min_alt = fmt_altitude(*td->min_alt, &min_alt_units);
-    kml_td(hwriter, QStringLiteral("Min Alt"), QStringLiteral(" %1 %2 ").arg(QString::number(min_alt, 'f', 3)).arg(min_alt_units));
+    kml_td(hwriter, QStringLiteral("Min Alt"), QStringLiteral(" %1 %2 ").arg(QString::number(min_alt, 'f', 3), min_alt_units));
   }
   if (td->max_alt) {
     const char* max_alt_units;
     double max_alt = fmt_altitude(*td->max_alt, &max_alt_units);
-    kml_td(hwriter, QStringLiteral("Max Alt"), QStringLiteral(" %1 %2 ").arg(QString::number(max_alt, 'f', 3)).arg(max_alt_units));
+    kml_td(hwriter, QStringLiteral("Max Alt"), QStringLiteral(" %1 %2 ").arg(QString::number(max_alt, 'f', 3), max_alt_units));
   }
   if (td->min_spd) {
     const char* spd_units;
     double spd = fmt_speed(*td->min_spd, &spd_units);
-    kml_td(hwriter, QStringLiteral("Min Speed"), QStringLiteral(" %1 %2 ").arg(QString::number(spd, 'f', 1)).arg(spd_units));
+    kml_td(hwriter, QStringLiteral("Min Speed"), QStringLiteral(" %1 %2 ").arg(QString::number(spd, 'f', 1), spd_units));
   }
   if (td->max_spd) {
     const char* spd_units;
     double spd = fmt_speed(*td->max_spd, &spd_units);
-    kml_td(hwriter, QStringLiteral("Max Speed"), QStringLiteral(" %1 %2 ").arg(QString::number(spd, 'f', 1)).arg(spd_units));
+    kml_td(hwriter, QStringLiteral("Max Speed"), QStringLiteral(" %1 %2 ").arg(QString::number(spd, 'f', 1), spd_units));
   }
   if (td->max_spd && td->start.isValid() && td->end.isValid()) {
     const char* spd_units;
     double elapsed = td->start.msecsTo(td->end)/1000.0;
     double spd = fmt_speed(td->distance_meters / elapsed, &spd_units);
     if (spd > 1.0)  {
-      kml_td(hwriter, QStringLiteral("Avg Speed"), QStringLiteral(" %1 %2 ").arg(QString::number(spd, 'f', 1)).arg(spd_units));
+      kml_td(hwriter, QStringLiteral("Avg Speed"), QStringLiteral(" %1 %2 ").arg(QString::number(spd, 'f', 1), spd_units));
     }
   }
   if (td->avg_hrt) {
@@ -957,7 +957,7 @@ static void kml_output_description(const Waypoint* pt)
   kml_td(hwriter, QStringLiteral("Latitude: %1 ").arg(QString::number(pt->latitude, 'f', precision)));
 
   if (kml_altitude_known(pt)) {
-    kml_td(hwriter, QStringLiteral("Altitude: %1 %2 ").arg(QString::number(alt, 'f', 3)).arg(alt_units));
+    kml_td(hwriter, QStringLiteral("Altitude: %1 %2 ").arg(QString::number(alt, 'f', 3), alt_units));
   }
 
   if (pt->heartrate) {
@@ -976,13 +976,13 @@ static void kml_output_description(const Waypoint* pt)
   if WAYPT_HAS(pt, depth) {
     const char* depth_units;
     double depth = fmt_distance(pt->depth, &depth_units);
-    kml_td(hwriter, QStringLiteral("Depth: %1 %2 ").arg(QString::number(depth, 'f', 1)).arg(depth_units));
+    kml_td(hwriter, QStringLiteral("Depth: %1 %2 ").arg(QString::number(depth, 'f', 1), depth_units));
   }
 
   if WAYPT_HAS(pt, speed) {
     const char* spd_units;
     double spd = fmt_speed(pt->speed, &spd_units);
-    kml_td(hwriter, QStringLiteral("Speed: %1 %2 ").arg(QString::number(spd, 'f', 1)).arg(spd_units));
+    kml_td(hwriter, QStringLiteral("Speed: %1 %2 ").arg(QString::number(spd, 'f', 1), spd_units));
   }
 
   if WAYPT_HAS(pt, course) {
diff --git a/osm.cc b/osm.cc
index b973be65b..654380f15 100644
--- a/osm.cc
+++ b/osm.cc
@@ -449,7 +449,7 @@ osm_feature_symbol(const int ikey, const char* value)
   if (values.contains(key)) {
     result = values.value(key)->icon;
   } else {
-    result = QString("%1:%2").arg(osm_features[ikey]).arg(value);
+    result = QString("%1:%2").arg(osm_features[ikey], value);
   }
   return result;
 }
diff --git a/ozi.cc b/ozi.cc
index 51d0d7356..82d3b2008 100644
--- a/ozi.cc
+++ b/ozi.cc
@@ -216,7 +216,7 @@ ozi_openfile(const QString& fname)
     sname.chop(suffix_len + 1);
   }
 
-  QString tmpname = QString("%1%2.%3").arg(sname).arg(buff).arg(ozi_extensions[ozi_objective]);
+  QString tmpname = QString("%1%2.%3").arg(sname, buff, ozi_extensions[ozi_objective]);
 
   /* re-open file_out with the new filename */
   if (file_out) {
diff --git a/trackfilter.cc b/trackfilter.cc
index dedefae37..04e9086ce 100644
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -263,10 +263,10 @@ void TrackFilter::trackfilter_split_init_rte_name(route_head* track, const QDate
       strftime(buff, sizeof(buff), opt_title, &tm);
       track->rte_name = buff;
     } else {
-      track->rte_name = QString("%1-%2").arg(opt_title).arg(datetimestring);
+      track->rte_name = QString("%1-%2").arg(opt_title, datetimestring);
     }
   } else if (!track->rte_name.isEmpty()) {
-    track->rte_name = QString("%1-%2").arg(track->rte_name).arg(datetimestring);
+    track->rte_name = QString("%1-%2").arg(track->rte_name, datetimestring);
   } else {
     track->rte_name = datetimestring;
   }